Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 10 May 2010 11:57:09 +0000 (11:57 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 10 May 2010 11:57:09 +0000 (11:57 +0000)

Trivial merge